I was in the same dilima as u. I went down to drive a new celica fully loaded, but its so much different feeling than the z and now that i waited i feel that im much happier with my decision. Best thing to do is wait it'll come along sooner or laterz. But good luck and have fun with whatever your decision may be.